From 73e5f817f47720d8ba17e49543640c77ccc30e06 Mon Sep 17 00:00:00 2001
From: robertl <robertl>
Date: Wed, 9 Jun 2004 16:16:12 +0000
Subject: [PATCH] Allow combinations of -w, -t, -r for in and out.   Tested by
 Lars Luthman on yellow eTrex with firmware version 2.20, multi-lingual.

---
 garmin.c | 40 +++++++++++++++-------------------------
 1 file changed, 15 insertions(+), 25 deletions(-)

diff --git a/garmin.c b/garmin.c
index 43d536ebd..1847a07cc 100644
--- a/garmin.c
+++ b/garmin.c
@@ -323,20 +323,15 @@ data_read(void)
 		return;
 	}
 
-	switch(global_opts.objective) {
-		case trkdata: 
-			track_read();
-			break;
-		case wptdata:
-			waypt_read();
-			break;
-		case rtedata:
-			route_read();
-			break;
-		default:
-			fatal(MYNAME ": Unknown objective %d.\n", 
-					global_opts.objective);
-	}
+	if (global_opts.masked_objective & WPTDATAMASK)
+	  waypt_read();
+	if (global_opts.masked_objective & TRKDATAMASK)
+	  track_read();
+	if (global_opts.masked_objective & RTEDATAMASK)
+	  route_read();
+	if (!(global_opts.masked_objective & 
+	      (WPTDATAMASK | TRKDATAMASK | RTEDATAMASK)))
+	  fatal(MYNAME ": Nothing to do.\n");
 }
 
 static GPS_PWay
@@ -579,18 +574,13 @@ data_write()
 	if (poweroff) {
 		return;
 	}
-	switch(global_opts.objective) {
-		case wptdata:
-			waypoint_write();
-			break;
-		case rtedata:
-			route_write();
-			break;
-		case trkdata:
-			track_write();
-			break;
-	}
 
+	if (global_opts.masked_objective & WPTDATAMASK)
+	  waypoint_write();
+	if (global_opts.masked_objective & RTEDATAMASK)
+	  route_write();
+	if (global_opts.masked_objective & TRKDATAMASK)
+	  track_write();
 }
 
 
-- 
2.30.2